Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jan 2011 06:21:24 +0000 (22:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jan 2011 06:21:24 +0000 (22:21 -0800)

Trivial merge